Merge from trunk
authorJason Rumney <jasonr@gnu.org>
Fri, 15 Jan 2010 23:16:26 +0000 (07:16 +0800)
committerJason Rumney <jasonr@gnu.org>
Fri, 15 Jan 2010 23:16:26 +0000 (07:16 +0800)

Trivial merge